Skip to content

slack-vitess-r15.0.5: backport upstream PR #11968#256

Merged
timvaillancourt merged 2 commits intoslack-vitess-r15.0.5from
bp-pr11968-slack-vitess-r15.0.5
Mar 15, 2024
Merged

slack-vitess-r15.0.5: backport upstream PR #11968#256
timvaillancourt merged 2 commits intoslack-vitess-r15.0.5from
bp-pr11968-slack-vitess-r15.0.5

Conversation

@timvaillancourt
Copy link

Description

This PR backports v16 PR vitessio#11968 that fixes build-related metrics/vars so the git branch, commit, etc is displayed correctly

We currently rely on this backport in v12 + v14. The debt is payed down in v16

Related Issue(s)

vitessio#11968

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

* Pass BUILD_GIT_BRANCH and BUILD_GIT_REV env into docker build

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Fix bootstrap version

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Fix bootstrap version, again

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

* Fix ws

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
@timvaillancourt timvaillancourt marked this pull request as ready for review March 15, 2024 18:23
@timvaillancourt timvaillancourt requested a review from a team as a code owner March 15, 2024 18:23
@github-actions github-actions bot added this to the v15.0.5 milestone Mar 15, 2024
@timvaillancourt timvaillancourt merged commit 66147a9 into slack-vitess-r15.0.5 Mar 15, 2024
@timvaillancourt timvaillancourt deleted the bp-pr11968-slack-vitess-r15.0.5 branch March 15, 2024 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants